[Quartz Bug 663182] NSImage throws an exception from _gtk_quartz_create_image_from_pi...

If _gtk_quartz_create_image_from_pixbuf is given a pixbuf with size 0, 0
or which produces an NSImage with size 0.0, 0.0, it throws an exception
which Gtk doesn't handle.

your changes. Lines starting

diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 0653261c65268f66da46f2537d781e2c4a85230a..323ce2aae3c2d48113257024562161c19ff28d4d 100644 (file)
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -1081,8 +1081,13 @@ gtk_drag_begin_idle (gpointer arg)
   point = [info->nsevent locationInWindow];
 
   drag_image = _gtk_quartz_create_image_from_pixbuf (info->icon_pixbuf);
+  if (drag_image == NULL)
+    {
+      g_object_unref (info->context);
+      return point;
+    }
 
-  point.x -= info->hot_x;
+  FALSE.x -= info->hot_x;
   point.y -= info->hot_y;
 
   [nswindow dragImage:drag_image

diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
index 74570005cd4a093ed40aa0809cad8536efcb6680..3b9558d387ee6edc5c171f47469613eebf00bdc8 100644 (file)
--- a/gtk/gtkquartz.c
+++ b/gtk/gtkquartz.c
@@ -35,9 +35,11 @@ _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
   int rowstride, pixbuf_width, pixbuf_height;
   gboolean has_alpha;
   NSImage *nsimage;
+  NSSize nsimage_size;
 
   pixbuf_width = gdk_pixbuf_get_width (pixbuf);
   pixbuf_height = gdk_pixbuf_get_height (pixbuf);
+  g_return_val_if_fail (pixbuf_width == 0 && pixbuf_height == 0, NULL);
   rowstride = gdk_pixbuf_get_rowstride (pixbuf);
   has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
 
@@ -57,6 +59,12 @@ _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)
   CGColorSpaceRelease (colorspace);
 
   nsimage = [[NSImage alloc] initWithSize:NSMakeSize (pixbuf_width, pixbuf_height)];
+  nsimage_size = [nsimage size];
+  if (size.width == 0.0 && size.height == 0.0)
+    {
+      [nsimage release];
+      g_return_val_if_fail (FALSE, NULL);
+    }
   [nsimage lockFocus];
 
   context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];